Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abstract type conversions into functions #269

Merged
merged 5 commits into from
Feb 15, 2019
Merged

Conversation

jacobperron
Copy link
Member

This helps with readability and maintainability.
Also eliminated use of assertions during conversions, defering to exceptions.

I plan to make use of these functions for the Action extension module (#257) in a follow-up PR.

This helps with readability and maintainability.
Also eliminated use of assertions during conversions, defering to exceptions.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron jacobperron added the in progress Actively being worked on (Kanban column) label Feb 5, 2019
@jacobperron jacobperron self-assigned this Feb 5, 2019
@jacobperron jacobperron added in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Feb 5, 2019
@jacobperron
Copy link
Member Author

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

This was referenced Feb 6, 2019
@jacobperron
Copy link
Member Author

The warnings are due to the new functions not being used in _rclpy_action.c. This is addressed in #270.

Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me.

@wjwwood
Copy link
Member

wjwwood commented Feb 6, 2019

Though if it requires #270 to avoid warnings, then maybe we should merge them into one pr.

@jacobperron
Copy link
Member Author

Though if it requires #270 to avoid warnings, then maybe we should merge them into one pr.

That works for me. #270 already has this commit. Before I was aware of the warnings, I thought it was nice to make this separate. I'll leave this hear for visibility, until #270 is merged.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Copy link
Member Author

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

rclpy/CMakeLists.txt Outdated Show resolved Hide resolved
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Copy link
Member Author

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Copy link
Member Author

jacobperron commented Feb 13, 2019

Rebuilding for Windows after adding visibility control: Build Status

Edit: Re-triggered build after 0eded64

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron jacobperron merged commit 174e337 into master Feb 15, 2019
@jacobperron jacobperron deleted the jacob/refactor_rclpy_c branch February 15, 2019 19:14
@jacobperron jacobperron removed the in review Waiting for review (Kanban column) label Feb 15, 2019
@jacobperron jacobperron mentioned this pull request Feb 15, 2019
10 tasks
jacobperron added a commit that referenced this pull request Mar 7, 2019
* Abstract type conversions into functions

This helps with readability and maintainability.
Also eliminated use of assertions during conversions, defering to exceptions.

* Move common C functions to a shared library 'rclpy_common'

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
nuclearsandwich pushed a commit that referenced this pull request Mar 10, 2019
* Add Action Client (#262)

* Add rclpy_action module

With functions for creating and destroying action clients.

* Implement action client

* Move common conversion function and typedefs to shared header file (impl/common.h)

* Add tests using mock action server

* Add action module for aggregating action related submodules

* Extend Waitable API so executors are aware of Futures

* Move check_for_type_support() to its own module

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Fix Executor not executing tasks if there are no ready entities in the wait set (#272)

If a task is created, then trigger the Executors guard condition. This will wake any blocking call to `rcl_wait()`.
In this scenario, no work is yielded, so we also have to move the check for 'in-progress' tasks into the wait loop.

Added a unit test to reproduce the issue.

This resolves an issue in some cases where the result response from the action server is never processed, therefore never reaching the action client.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Fix Node's reference to executor (#275)

Previously, if a `Node` was added to an `Executor` using the executors `add_node` method, then nodes `executor` property would return `None`.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Abstract type conversions into functions (#269)

* Abstract type conversions into functions

This helps with readability and maintainability.
Also eliminated use of assertions during conversions, defering to exceptions.

* Move common C functions to a shared library 'rclpy_common'

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Add ActionServer (#270)

* Add Action server functions to extension module
    * Separated service related macros into separate request and response calls
* Add server goal handle functions to extension module
* Update Action extension module to use conversion functions
* Add implementation of Python ActionServer
    * Handles goal and cancel requests, responds, and calls user-defined functions for executing goals.
    * Handle result requests
    * Handle expired goals
    * Publish goal status array and feedback
* Add `handle_accepted_callback` to ActionServer

Upon accepting a goal, the provided `handle_accepted_callback` is called with a reference to the goal handle.
The user can then decide to execute the goal or defer.
If `handle_accepted_callback` is not provided, then the default behavior is to execute the goal handle immediately.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Enable test using MultiThreadedExecutor (#280)

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Guard against failed take when taking action messages (#281)

Some middlewares (e.g. Connext and OpenSplice) send invalid messages to indicate an instance has been disposed which results in a 'failed take'.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants